# Conflicts:
#	src/server/adminJs/adminJs.ts
#	src/services/cronJobs/checkProjectVerificationStatus.test.ts
#	src/services/userService.ts
#	src/user/LoginResolver.ts
#	src/user/register/RegisterResolver.ts
#	src/utils/sendEmail.ts

# Conflicts:
#	src/adapters/notifications/NotificationCenterAdapter.ts
#	src/entities/entities.ts
#	src/ormconfig.ts
#	src/repositories/donationRepository.test.ts
#	src/repositories/qfRoundRepository.ts
#	src/repositories/userRepository.ts
#	src/resolvers/donationResolver.test.ts
#	src/resolvers/projectResolver.allProject.test.ts
#	src/resolvers/projectResolver.ts
#	src/resolvers/qfRoundResolver.test.ts
#	src/resolvers/qfRoundResolver.ts
#	src/resolvers/recurringDonationResolver.test.ts
#	src/resolvers/userResolver.ts
#	src/server/adminJs/tabs/qfRoundHistoryTab.ts
#	src/services/donationService.ts
#	src/services/projectUpdatesService.test.ts
#	src/services/recurringDonationService.test.ts
#	src/services/the-giving-blocks/api.ts
#	src/services/the-giving-blocks/syncProjectsCronJob.ts
#	test/testUtils.ts

# Conflicts:
#	src/repositories/donationRepository.test.ts
#	src/resolvers/projectResolver.ts
#	src/resolvers/recurringDonationResolver.test.ts
#	src/resolvers/recurringDonationResolver.ts
#	src/server/adminJs/tabs/donationTab.test.ts
#	src/server/adminJs/tabs/donationTab.ts
#	src/server/adminJs/tabs/qfRoundHistoryTab.ts
#	src/services/cronJobs/checkProjectVerificationStatus.test.ts
#	src/services/donationService.ts
#	src/services/recurringDonationService.ts

…tDonationMatchingJob.ts draftDonationMatchWorker.test.ts projectsTab.test.ts